gtk/gtkrc.c fix canonicalization of property names which was broken after

2006-07-07  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkrc.c
	* gtk/gtksettings.c: fix canonicalization of property names which
	was broken after recent constant string cleanup.

diff --git a/ChangeLog b/ChangeLog
index 6849f92915285987ffefad6680b306cf26d98255..6a0048f52011ecd1e5bb0b9e4d40d64a4a0f4461 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-07  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkrc.c
+       * gtk/gtksettings.c: fix canonicalization of property names which
+       was broken after recent constant string cleanup.
+
 2006-07-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c: Small memory savings.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6849f92915285987ffefad6680b306cf26d98255..6a0048f52011ecd1e5bb0b9e4d40d64a4a0f4461 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-07-07  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkrc.c
+       * gtk/gtksettings.c: fix canonicalization of property names which
+       was broken after recent constant string cleanup.
+
 2006-07-07  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c: Small memory savings.

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index b7102f095f67d5d77f31c4c30162d841911c9b77..b275e64f8f1aa0ec92d1becbbe10d4252724c34c 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -2679,7 +2679,7 @@ gtk_rc_parse_statement (GtkRcContext *context,
 
              svalue.origin = prop.origin;
              memcpy (&svalue.value, &prop.value, sizeof (prop.value));
-             g_strcanon (name, G_CSET_DIGITS "-_" G_CSET_a_2_z G_CSET_A_2_Z, '-');
+             g_strcanon (name, G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-');
              _gtk_settings_set_property_value_from_rc (context->settings,
                                                        name,
                                                        &svalue);
@@ -2921,7 +2921,7 @@ gtk_rc_parse_style (GtkRcContext *context,
 
              /* it's important that we do the same canonification as GParamSpecPool here */
              name = g_strdup (scanner->value.v_identifier);
-             g_strcanon (name, G_CSET_DIGITS "-_" G_CSET_a_2_z G_CSET_A_2_Z, '-');
+             g_strcanon (name, G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-');
              prop.property_name = g_quark_from_string (name);
              g_free (name);
 

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 8f1606583cec3282731e05f3cdc11255f39e8c75..2b038f9c205b6539c4d56249e22472cd13a9011a 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -971,7 +971,7 @@ gtk_settings_set_property_value_internal (GtkSettings            *settings,
     }
   
   name = g_strdup (prop_name);
-  g_strcanon (name, G_CSET_DIGITS "-_" G_CSET_a_2_z G_CSET_A_2_Z, '-');
+  g_strcanon (name, G_CSET_DIGITS "-" G_CSET_a_2_z G_CSET_A_2_Z, '-');
   name_quark = g_quark_from_string (name);
   g_free (name);